HM Distance #3

weathon · 2022-03-21T16:09:21Z

No description provided.

Conflicts: .gitignore

ngs333 · 2022-03-27T03:01:37Z

.gitignore

+##Ignore test output files
+
+*.csv
+


In the PR, this file is showing up as a new file, which should not be the case as there is one in the main brach.
I'm going ahead and update the repo ham brach with the main .gitignore. You can merge from either the main
brach or the ham beach on the repo. I am not 100% sure, but I think you can just do a git fetch and git pull.
If you have any issues, we can have a video conference.

ngs333 · 2022-03-27T03:14:23Z

src/apps/cmake_install.cmake

@@ -0,0 +1,44 @@
+# Install script for directory: /home/wg25r/new/CMT/src/apps


Files cmake_install.cmake is another (like Makefiles) that are auto generated and we dont want to install in
the repo. If you are adding them on purpose, let me know. But in the mean time I am adding them to the .gitignore.

ngs333 · 2022-03-27T03:22:04Z

src/vendor/edlib/CTestTestfile.cmake

@@ -0,0 +1,8 @@
+# CMake generated Testfile for 


We do not want to change anything in the the vendor subdirs. Can you plase not add files to stage via "add -A" (or the equivslent in the gui). In gour case, you need to manually select which files to add. Please unstage any vendor libs
before committing or just dont stage them.

ngs333 · 2022-04-03T02:47:09Z

.gitignore

+=======
+# WG all locations
+**/CMakeFiles
+**/.vscode


The directoryy .vscode under /CMT/src should be tracked.

ngs333 · 2022-04-03T02:48:57Z

src/cmake_install.cmake

@@ -0,0 +1,63 @@
+# Install script for directory: /home/wg25r/new/CMT/src


Like the other *.cmake files, we are not tracking this one in github.

ngs333

@weathon

Wayne,

If you look at your own pull request you will see that there are 31 files
the pull request is changing in some way. I am here attaching a png screenshot
of what it looks like. Anything with a + sign in a square is a new file. Anything with a dot in a square a modified file. I have made a few comments in the code, in summary:

we do not want to change or add in directory vendor/edlib
We are not tracking files named Makefile or cmake_install.cmake – these are auto generated.
we are not tracking any .a files (like libedlib.a which shows up in the /lib dir)
There is an empty directory with an empty file – we are not tracking these.

You are probably staging pre-commit these thought a command like “git add -A” or though a GUI
command that is the equivalent. You might want to consider adding your files
for staging one at a t time like:
cd CMT
git add src/metric/HM.h
gut add src/metric/Metric.h
etc

and then committing before pushing.

Of course there are many ways to achieve that above, but in any case you should inspect
your own PR and make sure you are not adding any of these unwanted files.

BTW, directory .vscode should be tracked.

ngs333 · 2022-04-03T03:13:21Z

@weathon
Attached in the PR view I mentioned in #3 (review).

ngs333

There are numerous issued. See my comments thought the code. BTW, if you want to bring in a new external library into the project. Send me the info of that lib (e.g. its github location or other location on the web) and I will figure out how to bring it in.

ngs333 · 2022-06-06T02:11:04Z

src/metric/HM.h

+	Plase note the "using" statement right after the end of the class definition,
+	which essentially fixes the dimention and data type for the project.
+*/
+const float randomVector[100] = {1.293421904122479, 1.695729592843372, 1.6719711547501275, 1.1125228837930246, 0.3463672735101978, 2.5971576840006523, 0.47356529987958007, 1.607870549803747, 0.504348570202557, 0.1327015965966274, 0.8407478678805063, 0.6456343347779361, 0.46206423584782796, 2.8044360904022763, 0.3534170421373124, 0.6282496527409083, 1.9274343239417293, 0.4990746743196527, 0.5921481940274671, 0.8130506394674535, 0.9179098654981169, 2.200866777474638, 0.40211321758317176, -1.3506930204269914, 0.12762957633867444, 0.10920202607758023, 2.570930325030065, -0.4605109329252228, 0.8423316879709882, 1.15205339995524, -0.0740485753715252, 0.045156458950561085, 0.2486728341172454, 1.0997250136431282, 1.6454537117301937, 0.16106755903944003, 1.3920690584862614, -1.4652215168295029, -0.5424358569542365, -0.6279762680635221, 0.7619374180187857, 3.0929171613939617, 1.3566763325755058, -0.5312541712966932, -0.02377305717104128, 0.7017996282633281, 0.6932799170379931, 2.404980607473966, -0.008448366109641947, 2.3335701143286656, 1.3090544685544825, 2.191448471203553, 0.9563462046503907, 1.1400149967902473, 0.060111570351233934, -0.44140936723571844, 0.7249121336233216, 0.33947909232267026, 0.4648919733787267, 0.7053070163166842, 1.633584717421872, 1.19772923388379, 0.9386077636155997, 1.104913523982289, 2.4739178942285793, -1.054105970320074, 0.09365996218770678, 1.4459017426807432, -0.24716241373271308, 0.9539362096588104, 2.5927566117627183, 1.331241099010263, 0.5441611494927473, 0.612775214196773, 2.175193539933754, 0.03082934287696737, 3.4984740065183204, 1.324657895747359, 1.3169343164489682, 1.0419990579690943, 0.9771503679842581, 0.9961158732634766, 2.1773811411945507, 1.0589228792469443, 0.7382605888100975, 0.34476012880302054, 2.5047089037430803, 1.9419190323933844, 0.25790869276220685, 1.6906093837845844, 0.3285786883488989, 2.8397878421918317, 0.8987657999056778, 1.8006459208447074, 0.5466175819849189, 1.1089715571944254, 0.9068432426977688, 1.1991397711007348, -0.260606133167711, 0.535703106828273}; 


Its not a good idea to hard code numbers as its done here.
If you want to use the same random number every time the program runs, you should learn how to seed a random number generator (possibly with function srand) before making the various calls to function rand to generate the numbers.

The size of the array should not be hard coded as is. It depends on the dimensionality, doesn't it?

ngs333 · 2022-06-06T02:12:08Z

src/metric/HM.h

+	// }
+};
+static const unsigned int HMDIM = 10;
+using EuclidianPointPointType = float;


This class should use the EuclidianPointPointType.

ngs333 · 2022-06-06T02:12:50Z

src/metric/Makefile

@@ -0,0 +1,203 @@
+# CMAKE generated file: DO NOT EDIT!


Makefiles are auto generated. We are not putting any in the repos.

ngs333 · 2022-06-06T02:13:42Z

src/metric/cmake_install.cmake

@@ -0,0 +1,44 @@
+# Install script for directory: /home/wg25r/new/CMT/src/metric


This is another file that is auto generated and that we are not saving in the repos.

ngs333 · 2022-06-06T02:21:09Z

src/metric/gedLib/Application.h

@@ -0,0 +1,120 @@
+#ifndef _APPLICATION_H_


Is this an external library? If and library cannot be brought in
via the git sub-module mechanism, all we can do is mention it in the README and tell users how to get it and where to put it. We just cannot store other peoples library in the repo.

It looks like there are other source files here from gedLib. They all get the same comment as in the paragraph above.

ngs333 · 2022-06-06T02:28:22Z

src/metric/gedLib/Application.cpp

@@ -0,0 +1,1638 @@
+#include "Application.h"


Is this an external library? If and library cannot be brought in
via the git sub-module mechanism, all we can do is mention it in the README and tell users how to get it and where to put it. We just cannot store other peoples library in the repo.

ngs333 · 2022-06-06T02:31:00Z

src/metric/q.txt

@@ -0,0 +1,10 @@
+t 1 methane


Is this a data file? this belongs in a different directory.

ngs333 · 2022-06-06T02:31:45Z

src/metric/test.cpp

@@ -0,0 +1,8 @@
+#include "gedLib/ged.h"


Apps dont belong in the src/metric direcotry.

ngs333 · 2022-06-06T02:32:25Z

src/search/Makefile

@@ -0,0 +1,203 @@
+# CMAKE generated file: DO NOT EDIT!


Same comment as for the other Makefiles.

ngs333 · 2022-06-06T02:32:39Z

src/search/cmake_install.cmake

@@ -0,0 +1,44 @@
+# Install script for directory: /home/wg25r/new/CMT/src/search


weathon and others added 6 commits March 21, 2022 16:07

HM Distance

7792b4d

Change the random to normal

65b835c

Fix ;

6d6dd3b

Add filename

2d81fae

Merge branch 'ham' of https://github.com/weathon/CMT into ham

2819006

Conflicts: .gitignore

fix mutli process range

8496eba

ngs333 requested changes Mar 27, 2022

View reviewed changes

weathon and others added 7 commits March 28, 2022 19:37

*=2

256ea6a

Merge branch 'ham' of https://github.com/weathon/CMT into ham

a0f6716

*=

d091f66

?

cbe3800

Merge branch 'ham' of https://github.com/weathon/CMT into ham

5af3c34

-

a386cba

Merge branch 'ham' of https://github.com/weathon/CMT into ham

14aca10

ngs333 reviewed Apr 3, 2022

View reviewed changes

.gitignore

=======

# WG all locations

**/CMakeFiles

**/.vscode

Copy link

Owner

ngs333 Apr 3, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The directoryy .vscode under /CMT/src should be tracked.

ngs333 reviewed Apr 3, 2022

View reviewed changes

ngs333 requested changes Apr 3, 2022

View reviewed changes

weathon added 12 commits May 14, 2022 03:18

Final

086b943

kun

37dab1d

weathin

701e95e

Range

0061c7c

change r range

6267df6

Change range

f3fe2c8

Merge branch 'ham' of https://github.com/weathon/CMT into ham

fc37a59

idk

89a2a51

shouzhijiantongaacitong un

75d9557

Merge branch 'ham' of https://github.com/weathon/CMT into ham

96ef6f5

Such stupid mistake...

859dc95

idk

8c00c10

weathon added 11 commits May 31, 2022 12:49

Merge branch 'ham' of https://github.com/weathon/CMT into ham

13f2d01

idk what i did

dfa2bcd

change r

6253d54

-

d335c58

Fixed int problem

928f566

koukuexkoubud

f2cde6e

-

ac54b14

-

d4efe74

rad

c0ce0bc

knn

8b1a4f3

Change rad

05b6223

ngs333 requested changes Jun 6, 2022

View reviewed changes

		@@ -0,0 +1,44 @@
		# Install script for directory: /home/wg25r/new/CMT/src/apps

		@@ -0,0 +1,63 @@
		# Install script for directory: /home/wg25r/new/CMT/src

HM Distance #3

Are you sure you want to change the base?

HM Distance #3

Uh oh!

Conversation

weathon commented Mar 21, 2022

Uh oh!

ngs333 Mar 27, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ngs333 left a comment

Choose a reason for hiding this comment

Uh oh!

ngs333 commented Apr 3, 2022

Uh oh!

ngs333 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

ngs333 Mar 27, 2022 •

edited

Loading

ngs333 left a comment •

edited

Loading